Continued improving the new task/kernel updates!