updates for some suggestions