Rich's table changes