modified for 9.23 future release