Upates for version 3