Fixing Problem with Index#Pins
Forgot to Pull into Manuel Branch so I am getting merge conflict