Added functionality for ma