updated from current Casper