Added CF1, Some revision of Jarvis1