updated to a WPF version