move runonce to right place