Pulling changes from Chrislgarry