upgraded solution to 2013