Added in Duncans cosmetic changes