updated for version 1.6
updated for version 1.6