Added Fix me for cluster method