edits for Tivadar