Getting Ivaylo's Refactor