switch to public, add updates

Change-Id: I7edb7b8b62abb684dada12667910c7f5f42eccdd