Updated code, Fixed bugs, Added suffix arg