Updated from Windows Forms -> WPF