Updated navajo changes