Changed some things for testing.