with cs fixes