edits from last version