Changes based on feedback by BG.