all onthefly stuff back in