Update 3/9/14 - Many improvements