added environment stuff