Updated typhoon checks, ready for testing.