further work on advanced mappings