reworking expr a little bit