Made changes to retain compatibility with the M+M libraries.