debugged the new changes