Code ajustments