an attempt at fixing sayonara, but not sure it's correct. Please  change if it's not right.