#1: Refactoring, according to Lionheart changes.