Updated with 'display' conditional