Improve CFP

Thanks to Navin!