added content from master