almost final updates