Added some changes

Added some changes