changes to get the @Endpoint to work