updated to prepare for hw4 development