changed stuff to non-static