Could be cleaner and less noisy