fixed depreciated things