Fixed VRDE issue & reshaped FSM