removed previous refactor