synching up with new mathAMA commits