Updates to allow Hastings trick.