Updated for first release