Extended edit (7/10)

Extended edit