Committed Richard's changes