Fixed Depreciated & class assignment