Update and Fixing