Modified some existing cases - Dec. 10 - 2013