Changes for watercraft function