 
         if isFirstResponder() || text!.isNotEmpty {
             placeholderLabel.font = placeholderFontFromFontAndPercentageOfOriginalSize(font: font!, percentageOfOriginalSize: 0.5)
-            placeholderLabel.text = placeholderLabel.text?.uppercaseString
+            placeholderLabel.text = placeholder?.uppercaseString
             placeholderLabel.textColor = activeColor
         } else {
             placeholderLabel.font = placeholderFontFromFontAndPercentageOfOriginalSize(font: font!, percentageOfOriginalSize: 0.7)
-            placeholderLabel.text = placeholderLabel.text?.capitalizedString
             placeholderLabel.textColor = placeholderColor
         }
     }

        return placeHolderInsets.y + placeholderFontFromFontAndPercentageOfOriginalSize(font: font!, percentageOfOriginalSize: 0.7).lineHeight
    }
    
    // MARK: - TextFieldEffects
    
    override public func animateViewsForTextEntry() {
        UIView.animateWithDuration(0.2, animations: {
            self.placeholderLabel.alpha = 0
            self.placeholderLabel.frame = self.placeholderRectForBounds(self.bounds)

        }
    }
    
    // MARK: - TextFieldEffects
    
    override public func animateViewsForTextEntry() {
        guard text!.isEmpty else { return }
        
        animateViews()
    }
    
    override public func animateViewsForTextDisplay() {
        guard text!.isEmpty else { return }
        
        animateViews()
    }
    
    // MARK: - Overrides
