Updated Paths and Comments