Updated for 2.0 Update