Added more code to tasks