refactored some exisiting tasks and added a few more