bug fix and delete added