Slightly modify the codebase