refactoring 14 cause it no worky