supersource and distributeonly refactored