Updates to enable 2 lanes, etc.