Major Update For V3.4