fixing up CS