I think this is working now. Will verify tomorrow.