Updated for version 4052