It's working so far... back to conditional