Re-designed most schemes.