updated based on recommendations / prod