Pulled in changes from sim/