changed number tokens to minimum 7 digits