modifications from class
updated 11/25