Better structure. Add test text