committing for merge
made some changes