No more VB, major improvements to code