Rich's changes