Updated code and license