refactored calls to CustomLabel