moved to 1.7, fixed deleting