Cleanup
Viaduct now in production
Corrected Viaduct