cd rip updates
merge