working data fixes necessary now