Updated to current live version