Changed findEntity(r,c).