COSMIC Update

Part of COSMIC Update