Made changes to get ready for testing.