Add arrowhead changes from master

PR after urgent Repo clean up
yep, hound is right. Need to fix this indentation