M_Boats: More work on M-23