Merged with updates to chopper.