make this closer to what we have in prod