Catboats, Second Edition