Updating fork from umd-mith