Moved task to main file