Updated for version 1.3.1