public marks

PUBLIC MARKS from naudjf with tags information & Castro