improve MAR handling