added 'edit'-support