Making some methods public to work closure. #18