Before rebuilding
Included cluster and refactorized