Extended edit (6/10)

Extended edit