Changes based on feedback by PL, QP, RM.