public marks

PUBLIC MARKS from benson56 with tags sw & flash