Moved the new stuff to top level