Fix function call conflit
Update Copyright