Changes in IMSR.java for matching question mark