Whatever.. refactor..