changes in main source code, pushed collectively