update after nice review feedback