More robust then before