some modifications - ipython still not integrated