Need to work on delete bug