Compatch for 2.3(Way of Life)