Modified many things... Version for SL and WPF