Module 5: Completed (Fixed issues)