first revision of endpoints