Updated my CS.S till unfinished