yeah that's a lot simpler - no need to regex!