converted some stuff to use player info