Cleared up public interface