Restored White functionality