add changes for proper CS Auth work