Latest Refactor