Updated working data binding