timer/activity

timer/activity
messages between reordering

messages between reordering
Merge pull request #51 from jimothy001/krystelle

Krystelle