final update according to feedback