that's exactly what i would do too; there are lots of improvements to be had by doing this.