license update
merged lates chic code in