Improve speed and add overall priority