public marks

PUBLIC MARKS from naudjf with tags tools & check