some changes
organizing elements