public marks

PUBLIC MARKS from sunny with tags code & rewrite