Changes to test out at home