changed schema slightly, reintegrated random feature