fixing deprecs since we last worked on this