replaced deprecated class