Updated CWrapped