replaced deprecated parts