deleted isfound variable
merge two commits