Updated for New SDK