Trying to reorganize better.