Again, let's wait for the actual refactor of this code.