don't wanna break any of the existing environments as a result of this change. In that case, wonder if we should avoid this altogether?