Moved new stuff to static