Ch.10 added 3-way, +cleanup