changed some sections, almost done