Making change for 3.6.0