Improve puller somewhat