public marks

PUBLIC MARKS from crazybaud with tags comp & dev