updated for version 1.6.1