6-18-2014 after changes made