Completed with expressions

Completed with expressions