changed to match speedswapper