Add arrowhead changes from master

PR after urgent Repo clean up
you have a class method that uses an instance variable?