A couple suggestions for Kiniamaro