just added some regex's