Adding Steve's changes