Add csetup (WITH BUG)