public marks

PUBLIC MARKS from cbn19 with tags 633 & optimisation