added lube, moved old stuff