Rezipped up Source to reflect changes for #118