cleaning up to pull from rob