Fine tuning this demo app