fixed old stuff