Trying to make compatible with Gar's pull.