reshuffled some things