mapl calculation rework