Added some code changes