Updated for new license