refucktoring
fixes
it's working