edited for git