working
added more sub-tasks