Two-lane update.
Oops. Should have included main.cpp earlier.