added support for both Aug Preview and beyond