added modified simulator