More changes to how modals are working