Merged code from Wainaina  and Vivens
	-