Changes related to upcoming new chapter