Refreshed codebase