public marks

PUBLIC MARKS from jdrsantos with tag tweaking