Updated and fix