pushing updated display checks.
Fixing merge issues.