More copyright issues and a little more code