Make it faster and better