small modifications
upgrade to 25r9