AZboat improvements

AZboat improvements