Many minor conversions (Sweep #19)