added cluster, updated stand-alone