Final figure updates