Corrected Merged Ipython file