added more barry edits