rf
perfomance fixes