slight changes to codebase