compiled/cleaned old stuff