Created new version using WPF.