Fixed ordering issues...ugh