Updated WPF