Added Delete. Fixed bug with error in BB