Update to Mikko Paukkila's proposal