Extended edit (5/10)

Extended edit