changes to working