CS updates to General.