More modal modifications