changed methods names and added map/filter