Changed to WPF