Some code changes here and there