Added more code changes