Try to fix major balance issues in version 3.1