fixed deletion and visit