update according to Spyros's feedback