WPF Changes

Updated WPF