added content, polishing framework