Make it faster and move things around