using map fn now