Yeah, good idea, you don't mind me changing this now? Also, I'm wondering if it can be applied to v3.0 as well.