Added thobbs recommended changes