Hack together changes