Revised per hw6