Add clustering functionality again :)