Control environment improvement

shape