Re-added complete interactive mode