structure change and borders added