reverted back to multiple endpoints