18% and 20% still needs refactoring