Spaghetti code update for testing.