REFACTOR MASSIVE