added simulator support