Changes for onewaymirror mode