Edit feature in a better stage