More modifications to switchToCold