Update from feedback