!U little refactor