modified some expressions