Edit functionality solve issue