Change unicorn tasks, close #7