initial commit from fork w/ red arrow bug fix