Added steve's changes