activity main commit

Activity main commit