implemented derek's extra changes.