Shuffled some funcs.