Updates to latest Cocos2d