shuffled some functions around