70% fixes