Updated to do all tasks