added activity tracking