Update after the fork August 1st 2017