Modifications meet timing but functionality needs to be debugged in simulator