New Refactor Changes