Additional improvements to ondeck