3.2 final update

Almost Done