updates for episode 7
fix for episode 5