Add mainline, improve floor