Some modifications to source