changed filter and added delete components