updated all changes up to 9/19/2014