some_9_10_changes