Incorporate jspam's comments