public marks

PUBLIC MARKS from newandforever with tags affected & test