Commenting out ritz as I still do not use it at the moment.