Small mod to scope task better