MD improvements