-- Edit functionality fixed