Some chapters have been adjusted