Feature: Fixer upper (7)