Updated for public release