tweaks to make it work in a new environment.