add makakiki support