more code reshuffling