Updated for the new patch