Several changes to cope with the new environment