Yeah I also changed that to use regexp which is nicer.