third test: improved mapping, it's ready to be used!