rf
perfomance fix