almost done | check for delete updates | clean and comment