Upgrade most of the requirements