Re-made earlier changes.