major changes, deletion works