Replaced map with forEach