removed border
merge bullsh..