Added ma front end