update sources
merged changes