Updated public functions