add exceptions and navigation upgrade