Adding changes before testing this evening