3rd Refactor