Commented out more "pin" stuff
Merge origin/master