Mofify the codebase