Started converting to new modal references