some changes in the sourceCode