export section superfluous call removed. performance test for mapping extended.