changed border handling