Added new for tasks (but not passing rspec tests)