fixing old stuff