public marks

PUBLIC MARKS from asteroza with tags outsourcing & 2.0