remove 'average'; implement 'improve' raw