sync up with simulator code