Updated to work with Trident again.