Updated All The Code for V12