Added env and mttop stuff