Fixed Jasper's comments