removed env, added more overview