reshuffled code around