adapt to Ocarina from GIT