public marks

PUBLIC MARKS from nhoizey with tags todo & modification