Edit to allow compilation against simulator