Updated with new tasks