Updated clustering