updated to pass deprecated errors