more code shuffling