updated with hacks done in prod