Changes to support new gliding method