CR: modifications 2