public marks

PUBLIC MARKS from project with tags logic & peter