updated to use mapping