TODO AMEND fix bugs with update against a cluster
cluster fixes