Updated for version 1.4.1