Final Changes Removed Borders