few changes in src files