Complete overhaul for MAS