Added except for empty tasks
Updated file lists again