(*)small code changes