* Reworked internal codes