Adding clustering. Adding hack not to look too deep