little refactor
not worked