Added accept and edit method