Removed the interactive-only code for stability