Add unreachable code back (will work w/ later)