Modified source based on documentation