now with cluster support