add forEach and map