Changes to sample env