More code moved to ipython