need to fix the last two exercises