Editing needs (32/33)

Editing needs