Commiting Spencer's changes