Updated and compressed