Yet another attempt to get this right