moved stuff to function pointers
moved stuff to function pointers