Commiting Code changes

Some code changes