updated for version 1.3.6