update as Alex feedback