environment seperation added