Refactor final 2