Pre Aaron stuff
Changes to color