fixed, 3/27/2014 changes from email. lots of changes