Upgrade 3 to 3.4 working but found a few bugs