update almost final