Update and bug fix