Added ninja in appropriate places