Updated with resharper