public marks

PUBLIC MARKS from nhoizey with tags standards & hacks