Extended edit (9/10)

Extended edit