Updated more code to test reg ex