minor changes, fixed deletion