#424 re-order of endpoints