Changed map call to forEach