Updating to r25