Update

100% working CRRC and other changes