Updated work in progress.