pickup changes from roxy master