More robust design