Added Jasper's changes from Dropbox