Updated Env. Model