WIP project fixed clustering