public marks

PUBLIC MARKS from JMF with tags optimisation & refactorisation