main thread: tiny changes