Updated after zmd94 testing