Fixing hw 7!