More interna changes