Cleaned Up New Boat Form