Updated expression with simplier code