Update and bug Fix