changed stuff to static