Added combine/until/decode