Updated code + license