WeeklyChallenge3 Fixes