Added some final changes for testing.