Feature/editing2