Added solution w/o env