Part 6 - Callback correction for new boats support