WIP on MD3.1 update