Initial revisions for slave mode (unfinished)