Little functions changes