update copyright notice
update copyright notice
more logical flow