Modified some files in order to match to original reps.