Upgrades

Conflicts:
	code.js