rework from ground
dont need border