No real changes, just trying to sort ReSharpe out