Updated for making public