additional changes. finalized the Ma.