Updating to work with 2013 API