update 17/9

final (hope so)