we added simulate and fixed some stuff