speed up and bug fix