small fix
perfomance test
refact to st