HACKING - refactor