edits from 06-15-2014