Reinstate simpler for master check