Replaced env code with scruffy