Improved Task-Management