Updated for display and transition