major changes to allow things to work