Merged simulator changes