updates with details
merged from master