Now with better environments and commands