added more access to the internals