Finished the ex for 3.4