Updated for 2.6.4 version