public marks

PUBLIC MARKS from kemar with tags oop & framework