yet another endpoint_base update o/