Changes to logic
License and more changes to logic