Make consistent with week 7 assignment