more work on standalone single panel mode POC