Submitting Casey's changes.