public marks

PUBLIC MARKS from tim37now with tags one & safety