Modified return to work on different envs