First change to my fork from jonnyboyC