add delete and resolve a bug