changed actions to use mapper