Changed implementation on edit action