Improved scalability & refactored.