1.6.4 with expanded functionality