public marks

PUBLIC MARKS from solveig_vidal with tags free & convertion