smooth transition + thread issue fixed