added activity tracking and activity stream