new intent and handler + fix for exam stage