Updating it to have public functions