Removed REGEX things