bringing codebase up to date