public marks

PUBLIC MARKS from asteroza with tags lock & locks