Refactor, added elements.