improvements for switching boat plans