SOme code changes