fix the refactor that i fcked up