Updated to latest simulator