Added edition logic