Fully-functional

Made changes in the wrong place. Silly Rendle.