Updated Env. Diagram