* Reworked the internal codes