Codebase sync up