AvdP - Still improving performance and messaging.