2nd try merge chirap_bak