Makeover Part 1, fixes #3