Okay, I think this version is correct.