Updated environment (WIP)