Changed solution to support 2010