Changed structure, added texts