Added word checks to regex