Preview modernization (Apr 2023)