enum added and bug fix