merging with cs version