changed deprecated calls