3160 Folsom Shell & Core Upgrades