removing tiedot and slower regex implementation