Updated for version 4.1