Updated upgrade to take from any schema to verion 3.