Rework 'update based on LG notes'