new almost final update