more work on tasks management