public marks

PUBLIC MARKS from asteroza with tags inspection & GENERIC