Rav refactor