cs fixes 2