Timothy Yen:
	- Update for 5.0
