Closer edit (18/19)

Closer edit