Improved the task checker