- Fix from Nibu
	- Adding back Chau's code