Began changes to improve speed