Implement delete and fix update