Change to use new CSS class