Refactored and bugfixes
Missing cluster_method