Extended edit (3/10)

Extended edit