Fixed bugs/Modified