remake atom mapping -> using mapping result object (953 examples)