3 chapters fixed
trying to merge