map function working, and replaced argument mapper in eval