updated for version 1.7.1