modified by git2dude