Activity management (5/25)

Activity management