added environment, played with classes