Last refactor before adding Gliimpse mode