re-enabling some changes.  Env amount does work.