Revised with Material 3