Moved things around for testing.