Major changes under the hood to speed things up