public marks

PUBLIC MARKS from newandforever with tags adapted & working