Started fixing simulation again