updated mada stuff