revamp exception 1