updated FP regular expressions