Add another uf to check is full
Refactory