Included some expressions.
Updated conditions and expressions.