Plus, $2 billion for public schools upgrades