Fixing update
Restoring delete
Redone parsing