edits by Antal