finally fix smooth transitions