Updated for 1.6.1 version