remove primary 'ALL' in routes, implement basis points, to be tested