Continued working on activities manager