adjusting for clusterId being passed through also