Simplified and renamed.