Refactor, working on new compound