Refactor.
New design. (NFIY)