This is good until we hit version 10. :) Shall we roll with it?