add commitAndContinue but not in use yet; need to debug