changes done for 11/2/2014 issues
resolved conflict