Updated Amami to Honami changes