Edits from 06-09